Fix messenger waiting for network issue